am 38c2dae5: Merge "Remove hardcoded include paths."

* commit '38c2dae5f12003ff39a5b1a5e46f079174fcedca':
  Remove hardcoded include paths.