Merge "Revert "Revert "Use AAPT2""" into oc-dev