Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp" am: 8c301d22e4 am: 538cef7b48
am: e7914cbf59

Change-Id: Ibad5cf498cda4daa8cdd6b0a81a05cda71782f10