Merge "Update makefiles after AOSP push."
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 2 Nov 2017 20:39:30 +0000 (20:39 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 2 Nov 2017 20:39:30 +0000 (20:39 +0000)

Trivial merge