f2fs: fix merge derp

Change-Id: I696135d1a9235de86311b0e3699f88f1ca58aef7