Merge "Run script/update_makefiles.py"