am 33e74ea9: am 768c70cf: am 6b72d291: Merge "Ignore inner classes when looking for tests"

* commit '33e74ea98a89e173e663fc179780f26906b77528':
  Ignore inner classes when looking for tests