Merge "Fix warnings generated by new makefiles."