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

Change-Id: Iaa9494df27cb85af9086af77888a14f72d379b40