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

Change-Id: I7c8be2c5c42c7b175c409a3ae3fd0d94833ecb79