Merge "Test extension -> Android.bp"
authorSteven Moreland <smoreland@google.com>
Thu, 5 Oct 2017 19:14:19 +0000 (19:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Oct 2017 19:14:19 +0000 (19:14 +0000)
am: d35806414c

Change-Id: I939d2d836ebc530e2805f4c85bb05c00d54dbc5b


Trivial merge