Merge "Revert "Use AAPT2"" into oc-dev am: dbaf1ea3be
am: 1376a806ea

Change-Id: I43f6169d0f6ef42f5ac258773a30454c36302bc6