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

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