Revert "Squash upstream f2fs changes"

This reverts commit bba19e4f13ea63aacf0d0221455e74a7163cc678.

Change-Id: I17d078fb4785d87c1ad6230276fa79485c89220c
Merge "Revert "Squash upstream f2fs changes"" into kitkat