Merge "Add notTestFile option to CoreTestRunner" into nyc-dev
am: bb466d705e

* commit 'bb466d705e914a7408e42579de2f1787bda79deb':
  Add notTestFile option to CoreTestRunner

Change-Id: I136e5f8cdbc033c58cb90e1daae71b277bce1263