am b8559790: Merge "Remove a non-existent directory from the include path."

* commit 'b8559790d43f2483c7910e87e33ceebeb40e9bec':
  Remove a non-existent directory from the include path.