Merge "Remove obsolete include path from makefiles"