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

Change-Id: I36ca83766ab9d5c0d54c9acdefb31838686028f8