Merge "Convert more of system/extras to Soong"
am: 1d332616ef

Change-Id: Ie145ed540f6e83bde5b9e37a14f394ae24436a1f