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

Change-Id: I5a73c4d44cdbe3a5e25acda2db7dd6cd13c8e1df