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

* commit 'd3d95172c3645a1d7a12e540638207ae4fb69cae':
  Remove hardcoded include paths.