Merge "Disable AAPT2 for modules that use missing features"
am: 87dc8d6576

Change-Id: I0b745f8f9bd0af7eaa4a395a7f024b981f4193c3