f2fs: more 3.0 backporting

Change-Id: I26bf75dfec71ab5e824fc35edd907244426037aa
Merge branch 'cm-11.0-wip' into cm-11.0
Merge branch into kk_mkt