Merge "Set ro.fstype.data when /data is mounted" into main