Merge commit '0ca06e252755158257c90f36642239954cb6508e' into HEAD

Change-Id: I1babda9ec2e053f653dd5975d7808517c78e568c
diff --git a/Android.mk b/Android.mk
index 1167e7e..945a03b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,8 +13,6 @@
 
 LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4 \
 
-LOCAL_STATIC_JAVA_LIBRARIES := guava
-
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 EXCLUDE_BACKUP_LIB_SRCS :=