Merge "fs_mgr: Move libfiemap back to fs_mgr from system/gsid."
am: 1526a46e92

Change-Id: I447ec99fe62a62dc6a248e424a6312720f6f5918