Merge change 21813 into donut

* changes:
  CTS: Fix console search for test packages
tree: ce291355d8b31bda24e40cbca462e23f2842d11a
  1. tests/
  2. tools/
  3. Android.mk