Merge "fs_mgr: use more unique_fd"
am: 5ae47e10c8

Change-Id: Iaf46c0b2132f34c7550d4df0a234ac00515214d5