diff --git a/Android.mk b/Android.mk
index 9e9a55a..4f8feb6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,6 @@
 
 LOCAL_MODULE_TAGS := optional
 
-contacts_common_dir := ../ContactsCommon
 phone_common_dir := ../PhoneCommon
 
 ifeq ($(TARGET_BUILD_APPS),)
@@ -12,9 +11,9 @@
 support_library_root_dir := prebuilts/sdk/current/support
 endif
 
-src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src
-res_dirs := res res-aosp $(contacts_common_dir)/res $(contacts_common_dir)/icons/res $(phone_common_dir)/res
-asset_dirs := $(contacts_common_dir)/assets
+src_dirs := src src-bind $(phone_common_dir)/src
+res_dirs := res res-aosp res-common icons/res $(phone_common_dir)/res
+asset_dirs := assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
@@ -82,5 +81,5 @@
 
 #########################################################################################
 
-# Use the folloing include to make our test apk.
+# Use the following include to make our test apk.
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/src/com/android/contacts/commonbind/ObjectFactory.java b/src-bind/com/android/commonbind/ObjectFactory.java
similarity index 100%
rename from src/com/android/contacts/commonbind/ObjectFactory.java
rename to src-bind/com/android/commonbind/ObjectFactory.java
diff --git a/src/com/android/contacts/commonbind/analytics/AnalyticsUtil.java b/src-bind/com/android/commonbind/analytics/AnalyticsUtil.java
similarity index 100%
rename from src/com/android/contacts/commonbind/analytics/AnalyticsUtil.java
rename to src-bind/com/android/commonbind/analytics/AnalyticsUtil.java
diff --git a/src/com/android/contacts/commonbind/experiments/Flags.java b/src-bind/com/android/commonbind/experiments/Flags.java
similarity index 100%
rename from src/com/android/contacts/commonbind/experiments/Flags.java
rename to src-bind/com/android/commonbind/experiments/Flags.java
diff --git a/src/com/android/contacts/commonbind/util/UserAgentGenerator.java b/src-bind/com/android/commonbind/util/UserAgentGenerator.java
similarity index 100%
rename from src/com/android/contacts/commonbind/util/UserAgentGenerator.java
rename to src-bind/com/android/commonbind/util/UserAgentGenerator.java
diff --git a/src/com/android/contactsbind/Assistants.java b/src-bind/com/android/contactsbind/Assistants.java
similarity index 100%
rename from src/com/android/contactsbind/Assistants.java
rename to src-bind/com/android/contactsbind/Assistants.java
diff --git a/src/com/android/contactsbind/HelpUtils.java b/src-bind/com/android/contactsbind/HelpUtils.java
similarity index 100%
rename from src/com/android/contactsbind/HelpUtils.java
rename to src-bind/com/android/contactsbind/HelpUtils.java
diff --git a/tests/Android.mk b/tests/Android.mk
index 4fd947c..c1a5eb4 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,11 +7,11 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
-src_dirs := src \
-    ../../ContactsCommon/TestCommon/src
+src_dirs := src ../TestCommon/src
+res_dirs := res res-common
 
-# Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
 
 LOCAL_PACKAGE_NAME := ContactsTests
 
@@ -20,4 +20,11 @@
 LOCAL_SDK_VERSION := current
 LOCAL_MIN_SDK_VERSION := 21
 
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    mockito-target
+
+LOCAL_AAPT_FLAGS := \
+    --auto-add-overlay \
+    --extra-packages com.android.contacts.common.tests
+
 include $(BUILD_PACKAGE)