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

Change-Id: Iaa3616d46a3367c68ef919d263b38ef4e3fefffe