Merge "Use AAPT2 for modules with manifest validation errors" am: 55d44f5eeb
am: 678fa53dc7

Change-Id: Iae86b58f96f1c807bc321d10293e63edffed7f41