Merge "AAPT2: Do not overlay comments"