Merge "Use AAPT2" into oc-dev
am: 88597e1773

Change-Id: I38a72f24e5a61dac2553b7ee3d35200642c7e8f2