Merge "Use AAPT2 for more modules with manifest validation errors"
am: ce1979d707

Change-Id: If52a42d9f2a95d5d957b177e36a7a14fd54bace9