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

* commit '8b3281273ce833495b665cf7664f0b71a6cc7b96':
  Fix incorrect test counts when filtering JUnit3 tests.