merge in oc-release history after reset to 05179b6749b6f6f6c864d387ea25f46e2a582b3d
diff --git a/core/build_id.mk b/core/build_id.mk
index 8c3caf9..7561de6 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=ORG32
+export BUILD_ID=ORG31B
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index baeab72..2fdfdc7 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -20,8 +20,6 @@
 PRODUCT_PACKAGES += \
     adb \
     adbd \
-    android.hardware.configstore@1.0-impl \
-    android.hardware.configstore@1.0-service \
     android.hidl.memory@1.0-service \
     android.hidl.memory@1.0-impl \
     atrace \