Merge change 9217 into donut

* changes:
  CTS: Clean up image resources
tree: 962f8e2a53de396759df6648b3ba3cb0b3ea3a44
  1. tests/
  2. tools/
  3. Android.mk