Merge "Test extension -> Android.bp"
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 5 Oct 2017 19:10:42 +0000 (19:10 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 5 Oct 2017 19:10:42 +0000 (19:10 +0000)

Trivial merge