am 4613a90: AI 147731: Forgot to submit the build changes for the

Merge commit '4613a90144021efd2c7850728520de01232254bb' into donut

* commit '4613a90144021efd2c7850728520de01232254bb':
  AI 147731: Forgot to submit the build changes for the
tree: a956811d1a9bfd060d4a51fd6bd17390f671f2ca
  1. tests/
  2. tools/
  3. Android.mk