Merge "Convert more of system/extras to Android.bp" am: 0a35afacda am: 03cc6a3537
am: 07bcf1a5c3

Change-Id: Iaff58bceea0b9f344cef8422211be668803fd374