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

Change-Id: Ib7f43ab43b562057540920367c70c621fca98ab8