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

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