Merge "AAPT2: always say which file failed to compile"