Cleanup gerritbot branches reporting to -infra

Some of our current branchs in the channels.yaml file are
stale. This patch cleans them up and adds the associated
repo as a comment to encourage consistent cleanup.

Change-Id: I52b0249f304c00655f1b617d52116e168fd3f349
Merge "Cleanup gerritbot branches reporting to -infra"