Merge "Fix CoreTestRunner collect tests" into nyc-dev
am: 4344c6e7e5

* commit '4344c6e7e590683a513c6ecdf4bedc623da34c63':
  Fix CoreTestRunner collect tests

Change-Id: Ie9ecc57ad064a6c6b39e5c71ca92d795fe7bf9a4