am c581e10a: am eca0043b: Merge "Disable canonical prefixes of system headers"

* commit 'c581e10a2b6f54e6f6b24dbd3e5fb10cdf3c77eb':
  Disable canonical prefixes of system headers