Update Security String to 2016-10-01 to platform and CTS for October am: 3e6d6b3024 am: 985a8b2709 am: 3920471588 am: 4739db2df6 am: 143bd253d3 am: 01262bec46 am: 8cf402ace2  -s ours am: 498e9543af am: 66a58cd393
am: e83a09a202

Change-Id: Ie554e7488c21f227af2de0a3b227d5f0f6b93025
diff --git a/core/Makefile b/core/Makefile
index ef745c6..2af421d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1306,10 +1306,6 @@
   $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \
   $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \
   $(HOST_OUT_EXECUTABLES)/make_ext4fs \
-  $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh \
-  $(HOST_OUT_EXECUTABLES)/mksquashfs \
-  $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \
-  $(HOST_OUT_EXECUTABLES)/make_f2fs \
   $(HOST_OUT_EXECUTABLES)/simg2img \
   $(HOST_OUT_EXECUTABLES)/e2fsck \
   $(HOST_OUT_EXECUTABLES)/build_verity_tree \
diff --git a/target/product/core.mk b/target/product/core.mk
index d453303..abb4c05 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -33,7 +33,6 @@
     DownloadProviderUi \
     Email \
     ExactCalculator \
-    Exchange2 \
     ExternalStorageProvider \
     FusedLocation \
     InputDevices \