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

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