Merge "Running update makefiles."