Merge "Revert "Revert "Use AAPT2""" into oc-dev am: e6cfc2ff63
am: e777c7bdc7

Change-Id: Ibf41dc758b32f4b4f0398c5013ad6d3899743f49