diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..55c50b0
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(my-dir)
+
+include $(call first-makefiles-under, \
+		$(LOCAL_PATH)/common \
+		$(LOCAL_PATH)/$(TARGET_PREBUILT_TAG) \
+		$(LOCAL_PATH)/$(HOST_PREBUILT_TAG)) \
diff --git a/common/dex/Android.mk b/common/dex/Android.mk
new file mode 100644
index 0000000..d184d5e
--- /dev/null
+++ b/common/dex/Android.mk
@@ -0,0 +1,27 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := dex-prebuilt
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := dex-host-prebuilt.jar
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+
+include $(BUILD_PREBUILT)
+
diff --git a/common/dex/MODULE_LICENSE_APL b/common/dex/MODULE_LICENSE_APL
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common/dex/MODULE_LICENSE_APL
diff --git a/common/dex/PREBUILT b/common/dex/PREBUILT
new file mode 100644
index 0000000..3be4468
--- /dev/null
+++ b/common/dex/PREBUILT
@@ -0,0 +1,8 @@
+The object in this prebuilt directory can be rebuilt from
+	libcore (target is dex-host)
+
+Steps to update
+1. make -j12 dex-host
+2. cp $ANDROID_HOST_OUT/framework/dex-host.jar prebuilts/runtime/common/dex/dex-host-prebuilt.jar
+
+From the revision 6f567f2bcbd07375c723e03c994a7c7674f42c7e
diff --git a/common/dex/dex-host-prebuilt.jar b/common/dex/dex-host-prebuilt.jar
new file mode 100644
index 0000000..492422d
--- /dev/null
+++ b/common/dex/dex-host-prebuilt.jar
Binary files differ