Merge "fs_mgr: fix typo from off64_t change." am: 7f5a2d3c8f
am: 573f03a2ca

Change-Id: Ib66d6c2cc41f2f5f24c83c638114df0df5d97275