Merge branch 'f2fs-all'

Conflicts:
	boot.img-ramdisk/sbin/fkbootscript.sh
Revert "f2fs fstab" from master branch

This reverts commit d604f080063d6c36667c7d1c87c7bc28fcf7a62a.
more ksm updates
Merge branch 'master' into f2fs

Conflicts:
	boot.img-ramdisk/fstab.hammerhead
	boot.img-ramdisk/sbin/fkbootscript.sh