Merge "Revert "Revert "Use AAPT2""" into oc-dev
am: e6cfc2ff63

Change-Id: I7634a7cedd45ee01facad8cc91316ce7cf1544eb