am 9d96629f: am 8b328127: Merge "Fix incorrect test counts when filtering JUnit3 tests."

* commit '9d96629fbe9c732353fd58eef3fa4b4b9babd278':
  Fix incorrect test counts when filtering JUnit3 tests.