Merge "Fix brainos in makefiles."