Merge "Use AAPT2 for modules with manifest validation errors"