Merge change 9036 into donut

* changes:
  CTS test cleanup to address comments from previous code review.
tree: d6b81e6fe957a7ea68ef807a656612066aa6e10b
  1. tests/
  2. tools/
  3. Android.mk