Merge "./update-makefiles.sh, for union changes/memory"