Merge "Add new tools/upstream/upstream-diff script."