reverting do not merge changes

cc2c78af55da6c34c1ea05efe596050d3344a8a2
cd99945261b2fb58cd003af45bbab831dfb01dc4
3c160c5a0240887f757032ab9d89ca400661a00f

Change-Id: I15709b539680ac0c47db1f7ac1ec1d3980546678
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index d1cfd57..1485979 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,5 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/aosp_shamu.mk \
-    $(LOCAL_DIR)/m_shamu.mk
+    $(LOCAL_DIR)/aosp_shamu.mk
diff --git a/device.mk b/device.mk
index 6f6f7cf..360c1d8 100644
--- a/device.mk
+++ b/device.mk
@@ -123,8 +123,7 @@
     hostapd \
     dhcpcd.conf \
     wpa_supplicant \
-    wpa_supplicant.conf \
-    sl4a
+    wpa_supplicant.conf
 
 PRODUCT_PACKAGES += atmel.fw.apq8084
 
diff --git a/m_shamu.mk b/m_shamu.mk
deleted file mode 100644
index 837b715..0000000
--- a/m_shamu.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright 2014 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Sample: This is where we'd set a backup provider if we had one
-# $(call inherit-product, device/sample/products/backup_overlay.mk)
-
-# Get the long list of APNs
-PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
-
-# Inherit from the common Open Source product configuration
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
-PRODUCT_NAME := m_shamu
-PRODUCT_DEVICE := shamu
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := Nexus 6
-PRODUCT_MANUFACTURER := motorola
-
-$(call inherit-product, device/moto/shamu/device.mk)
-$(call inherit-product-if-exists, vendor/moto/shamu/device-vendor.mk)
-
-PRODUCT_NAME := m_shamu
-
-PRODUCT_PACKAGES += \
-    Launcher3 \
-    ConnMO \
-    DCMO \
-    DMService
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/moto/shamu/overlay
-
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 5d24b27..4fd65b1 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -15,4 +15,3 @@
 #
 
 add_lunch_combo aosp_shamu-userdebug
-add_lunch_combo m_shamu-userdebug