Merge "Remove unnecessary Android.mk"
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 2 Nov 2017 04:18:28 +0000 (04:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 2 Nov 2017 04:18:28 +0000 (04:18 +0000)

Trivial merge