Merge update-waf.sh into update-external.sh