cm: Update projects and overlays

 * Disable non-working stuff (themes)
 * Re-enable now-working stuff

Change-Id: I929fabb2d9068616c48b5f16672cbb66f2600490
diff --git a/config/common.mk b/config/common.mk
index 27eee2c..9d35445 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -133,12 +133,11 @@
 
 # Required CM packages
 PRODUCT_PACKAGES += \
+    BluetoothExt \
     CMAudioService \
     CMParts \
     Development \
-    BluetoothExt \
     Profiles \
-    ThemeManagerService \
     WeatherManagerService
 
 # Optional CM packages
@@ -164,9 +163,7 @@
     CMSettingsProvider \
     ExactCalculator \
     LiveLockScreenService \
-    WeatherProvider \
-    DataUsageProvider \
-    WallpaperPicker
+    WeatherProvider
 
 # Exchange support
 PRODUCT_PACKAGES += \
@@ -223,14 +220,14 @@
     rsync
 
 # Stagefright FFMPEG plugin
-PRODUCT_PACKAGES += \
-    libffmpeg_extractor \
-    libffmpeg_omx \
-    media_codecs_ffmpeg.xml
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    media.sf.omx-plugin=libffmpeg_omx.so \
-    media.sf.extractor-plugin=libffmpeg_extractor.so
+#PRODUCT_PACKAGES += \
+#    libffmpeg_extractor \
+#    libffmpeg_omx \
+#    media_codecs_ffmpeg.xml
+#
+#PRODUCT_PROPERTY_OVERRIDES += \
+#    media.sf.omx-plugin=libffmpeg_omx.so \
+#    media.sf.extractor-plugin=libffmpeg_extractor.so
 
 # These packages are excluded from user builds
 ifneq ($(TARGET_BUILD_VARIANT),user)