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

Change-Id: I412a0f3df337c20c89b6168521ac7dd7a8e47ee5