diff --git a/core/Makefile b/core/Makefile
index e704748..54b12ff 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -133,6 +133,7 @@
 			BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \
 			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \
 			TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \
+			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \
 	        bash $(BUILDINFO_SH) > $@
 	$(hide) if [ -f $(TARGET_DEVICE_DIR)/system.prop ]; then \
 	          cat $(TARGET_DEVICE_DIR)/system.prop >> $@; \
diff --git a/core/config.mk b/core/config.mk
index 37ca404..e574124 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -136,6 +136,7 @@
 ifeq ($(TARGET_CPU_ABI),)
   $(error No TARGET_CPU_ABI defined by board config: $(board_config_mk))
 endif
+TARGET_CPU_ABI2 := $(strip $(TARGET_CPU_ABI2))
 
 # $(1): os/arch
 define select-android-config-h
diff --git a/core/product_config.mk b/core/product_config.mk
index 0a693f4..ffb8d27 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -199,6 +199,9 @@
 	$(PRODUCT_LOCALES) \
 	$(if $(filter %dpi,$(PRODUCT_LOCALES)),,mdpi))
 
+# Everyone gets nodpi assets which are density-independent.
+PRODUCT_LOCALES += nodpi
+
 # Assemble the list of options.
 PRODUCT_AAPT_CONFIG := $(PRODUCT_LOCALES)
 
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index f10b331..913c6cd6b 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
   # which is the version that we reveal to the end user.
   # Update this value when the platform version changes (rather
   # than overriding it somewhere else).  Can be an arbitrary string.
-  PLATFORM_VERSION := 2.1
+  PLATFORM_VERSION := 2.0.1
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"
diff --git a/envsetup.sh b/envsetup.sh
index a32d0b2..6dc2aa9 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -687,6 +687,13 @@
    fi
 }
 
+# systemstack - dump the current stack trace of all threads in the system process
+# to the usual ANR traces file
+function systemstack()
+{
+    adb shell echo '""' '>>' /data/anr/traces.txt && adb shell chmod 776 /data/anr/traces.txt && adb shell kill -3 $(pid system_server)
+}
+
 function gdbclient()
 {
    local OUT_ROOT=$(get_abs_build_var PRODUCT_OUT)
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index f35de85..572b823 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -24,10 +24,14 @@
 	libWnnEngDic \
 	libWnnJpnDic \
 	libwnndict \
+	CertInstaller \
+	LiveWallpapersPicker \
 	ApiDemos \
 	GestureBuilder \
 	SoftKeyboard
 
+PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay
+
 PRODUCT_COPY_FILES := \
 	development/data/etc/vold.conf:system/etc/vold.conf \
 	frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index af5aa47..6c85149 100755
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -21,6 +21,9 @@
 echo "ro.product.device=$TARGET_DEVICE"
 echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME"
 echo "ro.product.cpu.abi=$TARGET_CPU_ABI"
+if [ -n "$TARGET_CPU_ABI2" ] ; then
+  echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2"
+fi
 echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER"
 echo "ro.product.locale.language=$PRODUCT_DEFAULT_LANGUAGE"
 echo "ro.product.locale.region=$PRODUCT_DEFAULT_REGION"
diff --git a/tools/dump-package-stats b/tools/dump-package-stats
index 589bab5..d11e727 100755
--- a/tools/dump-package-stats
+++ b/tools/dump-package-stats
@@ -102,7 +102,7 @@
                 $1 != "Length" ||
                 $2 != "Method" ||
                 $3 != "Size" ||
-                $4 != "Ratio" ||
+                ($4 != "Ratio" && $4 != "Cmpr") ||
                 $5 != "Date" ||
                 $6 != "Time" ||
                 $7 != "CRC-32" ||