repopick: fix broken pipe error from "repo list"

  * the subprocess running "repo list" was not closed cleanly
    if the branch was found

Change-Id: Ie659966f3a670b25ab076a8dc723c4235760d04e
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2