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

Change-Id: I13a1dc2503cf2b07cfa23baa0158d9d127aacb05