Merge "Fix typo in update makefiles."