merge f2fs update

Change-Id: I0e01654a3e2b8f5b3088418c1afe5f5b828745c5