Merge "Use AAPT2" into oc-dev am: e7456613dc
am: 218a51b478

Change-Id: Ie084f6ec76814bf16326f49d58c10f629f72af6b