TWRP'd
Change-Id: I10371b9e6c14c22c40cb70667b14989b9e2f1c97
Merge remote-tracking branch 'wrapped/kk4.4-f2fs' into kk4.4-f2fs
Less voodoo

Change-Id: Ie9806acb6757023e1faa5771120e56c4c7e4f553