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

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