Merge "Rerun script/update_makefiles.py to fix build"