am 123253b8: am 690401db: Merge "Removed non-existing include dir"

* commit '123253b86893d50f13d82f489e47924a4b69c228':
  Removed non-existing include dir