Merge "Use AAPT2 for more modules with manifest validation errors"