diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT
index 91a2cde..4969b78 100644
--- a/common/ddmlib/PREBUILT
+++ b/common/ddmlib/PREBUILT
@@ -1,7 +1,7 @@
-The object in this prebuilt directory is a copy of the jar from
+The object in this prebuilt directory can be built from
 	platform/tools/base
 
-From the commit 5f23e7bbf550ed69576dff2178c21c7109259a2e
+From the commit 1cd60f02953f4df6f6905d6aa7a86a2a3758eed3
 
 Note: Before dropping the ddmlib-prebuilt.jar, please run
 the following command to strip the jar manifest file,
diff --git a/common/ddmlib/ddmlib-prebuilt.jar b/common/ddmlib/ddmlib-prebuilt.jar
index e12bc93..46d6a4b 100644
--- a/common/ddmlib/ddmlib-prebuilt.jar
+++ b/common/ddmlib/ddmlib-prebuilt.jar
Binary files differ
diff --git a/common/tradefed/PREBUILT b/common/tradefed/PREBUILT
index 4df0d32..4b0bd26 100644
--- a/common/tradefed/PREBUILT
+++ b/common/tradefed/PREBUILT
@@ -2,3 +2,4 @@
 	platform/tools/tradefederation
 
 From the revision bdfc46aa14b33f907f60202604c3667940c5c97a
+ with cherry-pick e9d4e8bab7fbb696d5f1b8115da35a2ee887bf6c
diff --git a/common/tradefed/tradefed-prebuilt.jar b/common/tradefed/tradefed-prebuilt.jar
index 04424f3..839ceed 100644
--- a/common/tradefed/tradefed-prebuilt.jar
+++ b/common/tradefed/tradefed-prebuilt.jar
Binary files differ