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