Merge "Use AAPT2 for more modules with manifest validation errors" am: ce1979d707
am: da6fcd1f9a

Change-Id: Ib73e574214064ba0c4112e901d9997724ecd7cb8