Merge "Revert "Include v4, use AAPT2"" into oc-dev
am: 487830bbcf

Change-Id: I731252c2b1de50d7d22327b2b4b963b9825dfa87