Merge "Add system/extras/Android.bp"