Merge "Add new tools/upstream/upstream-diff script."
am: ffdccef99f

Change-Id: Ic25210c8f1035d19432d51055af0330ca9e9ec1e