Merge "recovery: Clean up browse_directory()."
am: 635eb1c83e

Change-Id: Idf8a4e33a1f7cfd5d5c648aa97e00219828fc58d