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

Change-Id: Ia81759c6a107137ba9571f5567b9e56543aa3ae2