Merge "Remove old C fs_mgr interface"
am: 7303edd194

Change-Id: I01614f3bdbd5d7d142884d2da61cb56d25869987