Merge "Test extension -> Android.bp"
am: d35806414c

Change-Id: I939d2d836ebc530e2805f4c85bb05c00d54dbc5b