Merge "AAPT2: Fix debugging output"