Merge "Convert more of system/extras to Android.bp"