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

Change-Id: I60d37e6a50608258aba2b600f84342fffeec78d1