Merge "Add system/extras/Android.bp" am: 3a1544a877
am: 3ba28b0083

Change-Id: I8a178dd5c5d119a94f9655ab89d80f0f58e68aeb