diff --git a/Android.mk b/Android.mk
index a2e2f10..016d151 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SDK_VERSION := 17
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3f487cd..0486b00 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -94,7 +94,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.common.Search;
 import com.android.launcher3.R;
 import com.android.launcher3.DropTarget.DragObject;
 
@@ -1620,7 +1619,7 @@
         }
         if (appSearchData == null) {
             appSearchData = new Bundle();
-            appSearchData.putString(Search.SOURCE, "launcher-search");
+            appSearchData.putString("source", "launcher-search");
         }
         Rect sourceBounds = new Rect();
         if (mSearchDropTargetBar != null) {
