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

Change-Id: Ifc2c2068288b315750f2247bc0e34618bd081a6e