Merge "Use simplified update-makefiles.sh script."