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

Change-Id: I6c61c76706bcf8b454faa1822f788bb8b5886b55