Merge "Update makefiles."