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

Change-Id: Iba6ee4996c11d66fa7e6f510b0213b2e61f30524