Handle f2fs/ext4 userdata the Lollipop way
Thanks dhacker29

Change-Id: I40ed1f33c650e1d2e28976d8f8e934e58873308a