Handle f2fs/ext4 userdata the Lollipop way

Change-Id: I3cd59c6888a3f6d44e680f3d2c3863983dc32f57