Merge "Update Eclipse CDT include paths"