Merge commit '19a49586eec957b3e0402d5360d6fea35dbca0db' into HEAD

Change-Id: I0d8fcdcd4f2857b701de553b4846776929262636
diff --git a/v1/Android.mk b/v1/Android.mk
index 5915c16..c8405e0 100644
--- a/v1/Android.mk
+++ b/v1/Android.mk
@@ -24,12 +24,12 @@
         robolectric-commons-codec \
         robolectric-commons-logging \
         robolectric-h2 \
-        hamcrest-host \
+        hamcrest \
         robolectric-httpclient \
         robolectric-httpcore \
         robolectric-javassist \
         robolectric-json \
-        junit-host \
+        junit \
         robolectric-maps \
         objenesis-host \
         robolectric-sqlite-jdbc \