diff --git a/device.mk b/device.mk
index a7d51c22..fc06a799 100644
--- a/device.mk
+++ b/device.mk
@@ -1100,7 +1100,17 @@ PRODUCT_PACKAGES += \
 include hardware/google/pixel/thermal/device.mk
 PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
 
-include device/google/gs101/edgetpu/edgetpu.mk
+# EdgeTPU
+include device/google/gs-common/edgetpu/edgetpu.mk
+# Config variables for TPU chip on device.
+$(call soong_config_set,edgetpu_config,chip,abrolhos)
+# TPU firmware
+PRODUCT_PACKAGES += edgetpu-abrolhos.fw
+# TPU DBA AIDL HAL service
+PRODUCT_PACKAGES += com.google.edgetpu.dba-service
+# TPU DBA HAL C API library
+PRODUCT_PACKAGES += libedgetpu_dba_hal.google
+
 
 # Connectivity Thermal Power Manager
 PRODUCT_PACKAGES += \
diff --git a/edgetpu/OWNERS b/edgetpu/OWNERS
deleted file mode 100644
index 9eb92a96..00000000
--- a/edgetpu/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-# Devs who work on EdgeTPU on Android.
-hsuy@google.com
-yuchicheng@google.com
-iayara@google.com
-qinyiyan@google.com
-macwang@google.com
\ No newline at end of file
diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk
deleted file mode 100644
index ef74bcd0..00000000
--- a/edgetpu/edgetpu.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Config variables for TPU chip on device.
-$(call soong_config_set,edgetpu_config,chip,abrolhos)
-
-# TPU logging service
-PRODUCT_PACKAGES += \
-	android.hardware.edgetpu.logging@service-edgetpu-logging
-
-# TPU firmware
-PRODUCT_PACKAGES += \
-	edgetpu-abrolhos.fw
-
-# TPU NN AIDL HAL
-PRODUCT_PACKAGES += \
-	android.hardware.neuralnetworks@service-darwinn-aidl
-
-# TPU application service
-PRODUCT_PACKAGES += \
-	vendor.google.edgetpu_app_service@1.0-service
-
-# TPU vendor service
-PRODUCT_PACKAGES += \
-	vendor.google.edgetpu_vendor_service@1.0-service
-
-# TPU HAL client library
-PRODUCT_PACKAGES += \
-	libedgetpu_client.google
-
-# TPU metrics logger library
-PRODUCT_PACKAGES += \
-	libmetrics_logger
-
-# TPU DBA AIDL HAL service
-PRODUCT_PACKAGES += \
-	com.google.edgetpu.dba-service
-
-# TPU DBA HAL C API library
-PRODUCT_PACKAGES += \
-	libedgetpu_dba_hal.google
-
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/edgetpu/