Merge "Work around an issue with aapt am: 7b6e65db am: 290c6f16 am: dc0e82eb" into nyc-mr2-dev-plus-aosp