Have gerrit-git-prep use git.o.o

It's an optional 3rd argument, so the transition should be graceful.

Change-Id: Id62101fdbc4081f8a6b295f84568d78f8c8cb6e5
Merge "Have gerrit-git-prep use git.o.o"