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

Change-Id: Iffe91f55a285041dcd3619ae28f6b03f4f91f1d3