Merge "recovery: Minor clean up to choose_recovery_file()." am: 73d21d1c1c
am: 4a2bde2d26

Change-Id: Ib0d23cb6913b6133009efc14d070232f9c9e2bed