diff --git a/apps/BluetoothDebug/Android.mk b/apps/BluetoothDebug/Android.mk
index 7cfff51da..08c4911c6 100644
--- a/apps/BluetoothDebug/Android.mk
+++ b/apps/BluetoothDebug/Android.mk
@@ -8,6 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_JAVA_LIBRARIES :=
 
 LOCAL_PACKAGE_NAME := BluetoothDebug
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
 
 LOCAL_PROGUARD_ENABLED := disabled
diff --git a/apps/CustomLocale/Android.mk b/apps/CustomLocale/Android.mk
index 4b8badc21..6bda04065 100644
--- a/apps/CustomLocale/Android.mk
+++ b/apps/CustomLocale/Android.mk
@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := CustomLocale
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
 
 include $(BUILD_PACKAGE)
diff --git a/apps/Development/Android.mk b/apps/Development/Android.mk
index 9dd2e1a34..894709fc7 100644
--- a/apps/Development/Android.mk
+++ b/apps/Development/Android.mk
@@ -9,6 +9,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \
                 src/com/android/development/IRemoteService.aidl \
 
 LOCAL_PACKAGE_NAME := Development
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
 
 include $(BUILD_PACKAGE)
diff --git a/apps/DevelopmentSettings/Android.mk b/apps/DevelopmentSettings/Android.mk
index ae39e2599..ee4860276 100644
--- a/apps/DevelopmentSettings/Android.mk
+++ b/apps/DevelopmentSettings/Android.mk
@@ -2,5 +2,6 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_PACKAGE_NAME := DevelopmentSettings
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)
diff --git a/apps/Fallback/Android.mk b/apps/Fallback/Android.mk
index cb4ffc4b2..f3463efe1 100644
--- a/apps/Fallback/Android.mk
+++ b/apps/Fallback/Android.mk
@@ -6,5 +6,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := Fallback
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)
diff --git a/apps/NinePatchLab/Android.mk b/apps/NinePatchLab/Android.mk
index c49a095cb..701c16e64 100644
--- a/apps/NinePatchLab/Android.mk
+++ b/apps/NinePatchLab/Android.mk
@@ -6,5 +6,6 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := NinePatchLab
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)
diff --git a/apps/SdkSetup/Android.mk b/apps/SdkSetup/Android.mk
index c8b11f68a..833de03aa 100644
--- a/apps/SdkSetup/Android.mk
+++ b/apps/SdkSetup/Android.mk
@@ -6,6 +6,7 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := SdkSetup
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
 
 LOCAL_PROGUARD_ENABLED := disabled
diff --git a/apps/launchperf/Android.mk b/apps/launchperf/Android.mk
index f3d29bbc9..ba0d24dfb 100644
--- a/apps/launchperf/Android.mk
+++ b/apps/launchperf/Android.mk
@@ -6,6 +6,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_PACKAGE_NAME := launchperf
+LOCAL_SDK_VERSION := current
 
 LOCAL_MODULE_TAGS := tests
 
diff --git a/samples/RenderScript/Levels/Android.mk b/samples/RenderScript/Levels/Android.mk
index 3f1445daf..ab02ecb31 100644
--- a/samples/RenderScript/Levels/Android.mk
+++ b/samples/RenderScript/Levels/Android.mk
@@ -22,5 +22,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 
 LOCAL_PACKAGE_NAME := LevelsRS
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)
diff --git a/samples/apkcachetest/Android.mk b/samples/apkcachetest/Android.mk
index d7c7a444f..a6f9481f4 100644
--- a/samples/apkcachetest/Android.mk
+++ b/samples/apkcachetest/Android.mk
@@ -22,6 +22,7 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := ApkCacheTest
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_CERTIFICATE := shared