Merge "Fix potential aapt crash when processing overlay."