[Updater] Automatically run `git merge`

Test: updater.sh update xz-java
Change-Id: I3924b5651f2fac3c5d7493964b570f2f39bc4777
2 files changed