Merge "Fix userdata partition's ext4 mount point to data." into gingerbread