Merge change 1706 into donut

* changes:
  Change cts tests to use InstrumentationTestRunner.
tree: 9abbf906baf02d081774dfe78dcfc30f4a2ed156
  1. tests/
  2. tools/
  3. Android.mk