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

Change-Id: Id7c90b9e86e0b7aeb2e51663d3382d4f003f68f5