Merge "Convert aapt to Soong" am: 7bd321ca25 am: 9f5e3e822c
am: 946e6eedc2

Change-Id: Iffb3b89148643365a356512d806a4e9e123e359b