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

Change-Id: I9f91b3b8a66a2bd0d1fc27ddcdea2f72f0a54b58