Merge "Use AAPT2 for modules with manifest validation errors" am: 59fa1bcf69
am: 0cdc6edb51

Change-Id: I89da1d4e4a4ba1a9aba87f0c66f459e4ed39b82b