Merge "Convert aapt to Soong"
am: 7bd321ca25

Change-Id: Ia55efab04b2117049d34335ff4141f5eeb1ef25a