diff --git a/Android.bp b/Android.bp
index b79b895..7156389 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,13 +41,3 @@ sh_binary {
     vendor: true,
     sub_dir: "hw",
 }
-
-// Filesystem: Copy the content of the efs/efs_backup/modem_userdata/persist
-// partitions to /data partition so that they can be accessed by 16kb kernels.
-// By default, these partitions are F2FS formatted with 4kb block size,
-// which can't be mounted by 16kb kernels.
-sh_binary {
-    name: "copy_efs_files_to_data",
-    src: "copy_efs_files_to_data.sh",
-    vendor: true,
-}
diff --git a/copy_efs_files_to_data.sh b/copy_efs_files_to_data.sh
deleted file mode 100644
index b6b7a9d..0000000
--- a/copy_efs_files_to_data.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/vendor/bin/sh
-
-CHECKPOINT_DIR=/data/vendor/copied
-
-export BIN_DIR=/vendor/bin
-
-$BIN_DIR/mkdir -p $CHECKPOINT_DIR
-
-function copy_files_to_data()
-{
-  block_device=$1
-  partition_name=$(basename $1)
-  mount_point=$2
-  tmpdir=$CHECKPOINT_DIR/$partition_name.img
-  build_checkpoint=$CHECKPOINT_DIR/$partition_name
-  if [ ! -e $build_checkpoint ]; then
-    $BIN_DIR/rm -rf $tmpdir
-    $BIN_DIR/mkdir -p $tmpdir
-    $BIN_DIR/dump.f2fs -rfPo $tmpdir $block_device
-    if [ $? -ne 0 ]; then
-      echo "Failed to $BIN_DIR/dump.f2fs -rfPo $tmpdir $block_device"
-      return
-    fi
-    $BIN_DIR/mv $tmpdir $build_checkpoint
-    if [ $? -ne 0 ]; then
-      echo "mv $tmpdir $build_checkpoint"
-      return
-    fi
-    $BIN_DIR/fsync `dirname $build_checkpoint`
-  fi
-  echo "Successfully copied $mount_point to $build_checkpoint"
-}
-
-copy_files_to_data "/dev/block/by-name/efs" "/mnt/vendor/efs"
-copy_files_to_data "/dev/block/by-name/efs_backup" "/mnt/vendor/efs_backup"
-copy_files_to_data "/dev/block/by-name/modem_userdata" "/mnt/vendor/modem_userdata"
-copy_files_to_data "/dev/block/by-name/persist" "/mnt/vendor/persist"
-
-$BIN_DIR/fsync /data/vendor/copied
diff --git a/device.mk b/device.mk
index c6e3263..4f17979 100644
--- a/device.mk
+++ b/device.mk
@@ -45,6 +45,7 @@ include device/google/gs-common/bootctrl/bootctrl_aidl.mk
 include device/google/gs-common/betterbug/betterbug.mk
 include device/google/gs-common/recorder/recorder.mk
 include device/google/gs-common/fingerprint/fingerprint.mk
+include device/google/gs-common/16kb/16kb.mk
 
 include device/google/zumapro/dumpstate/item.mk
 
@@ -491,7 +492,6 @@ PRODUCT_COPY_FILES += \
 	device/google/zumapro/conf/init.efs.16k.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.efs.rc \
 	device/google/zumapro/conf/fstab.efs.from_data:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs.from_data
 
-PRODUCT_PACKAGES += copy_efs_files_to_data
 PRODUCT_PACKAGES += fsck.f2fs.vendor
 else
 PRODUCT_COPY_FILES += \