am 5671dd6: AI 148455: CTS: Change tests in Android plan to use new Inst

Merge commit '5671dd66999a0b43ca078458e3db59b3263d4fa1' into donut

* commit '5671dd66999a0b43ca078458e3db59b3263d4fa1':
  AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner
tree: 09e0c37deb09f2284c77f95cac6ef5fcc5904992
  1. tests/
  2. tools/
  3. Android.mk