Merge change 9423 into donut

* changes:
  More cts test fixes.
tree: 449fbd47e81aa66da0e2cdfee62ce3eee256ecf1
  1. tests/
  2. tools/
  3. Android.mk