diff --git a/Android.mk b/Android.mk
index 4cbcb28..d9d26ff 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,12 +16,11 @@
 LOCAL_PATH := $(call my-dir)
 
 okhttp_common_src_files := $(call all-java-files-under,okhttp/src/main/java)
-okhttp_common_src_files += $(call all-java-files-under,okhttp-protocols/src/main/java)
+okhttp_common_src_files += $(call all-java-files-under,okio/src/main/java)
 okhttp_system_src_files := $(filter-out %/Platform.java, $(okhttp_common_src_files))
 okhttp_system_src_files += $(call all-java-files-under, android/main/java)
 
-okhttp_test_src_files := $(call all-java-files-under,okhttp/src/test/java)
-okhttp_test_src_files += $(call all-java-files-under,okhttp-protocols/src/test/java)
+okhttp_test_src_files := $(call all-java-files-under,okhttp-tests/src/test/java)
 okhttp_test_src_files += $(call all-java-files-under,mockwebserver/src/main/java)
 okhttp_test_src_files := $(filter-out mockwebserver/src/main/java/com/squareup/okhttp/internal/spdy/SpdyServer.java, $(okhttp_test_src_files))