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

Change-Id: Icabc7df9f4b85b9eee3f22822d713b51a6ddd3d1