Merge "Revert "Error correction: Use libfec in fs_mgr""