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

Change-Id: If4ccbdc6ad48be04c79b7d31af1e1107829d8386