diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 7055a67..8d3bd67 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,13 +15,11 @@
 #
 
 PRODUCT_MAKEFILES := \
-	aosp_cf_x86_64_auto:$(LOCAL_DIR)/vsoc_x86_64/auto/device.mk \
 	aosp_cf_x86_64_phone:$(LOCAL_DIR)/vsoc_x86_64/phone/device.mk \
 	aosp_cf_x86_64_tablet:$(LOCAL_DIR)/vsoc_x86_64/tablet/device.mk \
 	aosp_cf_x86_64_tablet_3g:$(LOCAL_DIR)/vsoc_x86_64/tablet_3g/device.mk \
 	aosp_cf_x86_64_tv:$(LOCAL_DIR)/vsoc_x86_64/tv/device.mk \
 	aosp_cf_x86_64_wear:$(LOCAL_DIR)/vsoc_x86_64/wear/device.mk \
-	aosp_cf_x86_auto:$(LOCAL_DIR)/vsoc_x86/auto/device.mk \
 	aosp_cf_x86_phone:$(LOCAL_DIR)/vsoc_x86/phone/device.mk \
 	aosp_cf_x86_tablet:$(LOCAL_DIR)/vsoc_x86/tablet/device.mk \
 	aosp_cf_x86_tablet_3g:$(LOCAL_DIR)/vsoc_x86/tablet_3g/device.mk \
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 3f110e1..edd239f 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,13 +14,11 @@
 # limitations under the License.
 #
 
-add_lunch_combo aosp_cf_x86_auto-userdebug
 add_lunch_combo aosp_cf_x86_phone-userdebug
 add_lunch_combo aosp_cf_x86_tablet-userdebug
 add_lunch_combo aosp_cf_x86_tablet_3g-userdebug
 add_lunch_combo aosp_cf_x86_tv-userdebug
 add_lunch_combo aosp_cf_x86_wear-userdebug
-add_lunch_combo aosp_cf_x86_64_auto-userdebug
 add_lunch_combo aosp_cf_x86_64_phone-userdebug
 add_lunch_combo aosp_cf_x86_64_tablet-userdebug
 add_lunch_combo aosp_cf_x86_64_tablet_3g-userdebug