Merge "update-makefiles.py" into oc-dev