Merge "Disable canonical prefixes of system headers"