tree 3d3d99edf492dbe1e53446726c9dcabd11daab76
parent e5e7aa0e8031f6f1c0ed370f70e49778f3570527
author Roozbeh Pournader <roozbeh@google.com> 1444876469 -0700
committer Roozbeh Pournader <roozbeh@google.com> 1444876667 -0700

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