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

Change-Id: Ib5c647a5129794248862156bf8f836c74ddbf486