Merge change 7969 into donut

* changes:
  Cts content tests cleanup.
tree: 491ee8c6a752e97cd0ad91ef19561f55afadadfb
  1. tests/
  2. tools/
  3. Android.mk