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

Change-Id: Ib9454bde225b48753c09b0136e349f1e65f06c8f