Merge "Update makefiles for logging."