diff --git a/build/core/clear_vars.mk b/build/core/clear_vars.mk
new file mode 100644
index 0000000..5b86d69
--- /dev/null
+++ b/build/core/clear_vars.mk
@@ -0,0 +1,4 @@
+#
+#CM-specific variable clears
+#
+LOCAL_IGNORE_SUBDIR :=
diff --git a/config/common.mk b/config/common.mk
index c3c13a8..a0e3ca0 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -151,6 +151,17 @@
     CMHome \
     CyanogenSetupWizard
 
+ifeq ($(filter NIGHTLY SNAPSHOT EXPERIMENTAL,$(CM_BUILDTYPE)),)
+# CM Platform Library Resource Package
+PRODUCT_PACKAGES += \
+    org.cyanogenmod.platform-res
+
+# CM Platform Library
+PRODUCT_PACKAGES += \
+    org.cyanogenmod.platform \
+    org.cyanogenmod.platform.xml
+endif
+
 # CM Hardware Abstraction Framework
 PRODUCT_PACKAGES += \
     org.cyanogenmod.hardware \
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index a6b5cc7..ac16d35 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -3,3 +3,4 @@
 themes                                    u:object_r:system_server_service:s0
 torch                                     u:object_r:system_server_service:s0
 killswitch                                u:object_r:system_server_service:s0
+cmstatusbar                               u:object_r:system_server_service:s0