Merge "AAPT2: Specify the output APK in log messages"