Merge "CoreTestRunner inclusion and exlusion filtering" into nyc-dev
am: 1f6e04e9b2

* commit '1f6e04e9b200e9e17ce05750c692128b6173e5ed':
  CoreTestRunner inclusion and exlusion filtering

Change-Id: I4eca3e743595c3396dfeee924301684ef1ef4d01