Fix problem with tracking branches

Running initrepo shouldn't remove branches we're tracking that
are not in the original branchlist.

Change-Id: I58755b6757151215f1030a0306af47507ee86ddd