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

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