Merge "core+tools: support specifying F2FS as the fstype for userdata"