Merge "Use AAPT2" into oc-dev
am: cfbfeee8ee

Change-Id: I03c332a8ec38f714615dec4391d00f6fe6727c25