Merge change 8933 into donut

* changes:
  A bunch of fixes for cts tests in donut.
tree: 0cacbd7414a8acfd6408bed29ff5c5b37d5c93e4
  1. tests/
  2. tools/
  3. Android.mk