Merge "Fix aapt2 whitespace diffs from aapt(1)"