am af9a409: AI 147786: Automated g4 rollback of changelist 147771.

Merge commit 'af9a409bf54a26b78e08e7799192dad5ddfda648' into donut

* commit 'af9a409bf54a26b78e08e7799192dad5ddfda648':
  AI 147786: Automated g4 rollback of changelist 147771.
tree: 169a1f684a574aca045ae029a4a261a2cdb9040c
  1. tests/
  2. tools/
  3. Android.mk