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