Merge "recovery: Minor clean up to choose_recovery_file()."