tools: Update diff-upstream script.
tools: Tweak pull-upstream script.