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

Change-Id: I1ae5e646a5c519860450ef1bbef72aacb2c1e915