Merge "Normalize output from aapt d"