Complete half-done cherry-picking of Android.mk. DO NOT MERGE

The previous commit, 6e2cccdc518f8d3424c84ae6fbe0e87ae3c3f66a, was
incompletely cherry-picked. This adds the missing parts.

Bug: 24570591
Change-Id: I1097c60587fb8a88cfe6b8ffed5b1689d9bdd429
1 file changed
tree: 3d3d99edf492dbe1e53446726c9dcabd11daab76
  1. app/
  2. doc/
  3. include/
  4. libs/
  5. sample/
  6. tools/