Merge \\"AAPT: Don\\'t keep processing files that failed to be added\\" into nyc-mr1-dev am: d94f55552f
am: 28250b6009

Change-Id: Ibdc265278fea76d4d8a7ac478a80ffdcd827fd16