Make ProGuard keep @VisibleForTesting classes and methods

Change-Id: I7f5d14fd4188859c52ab85c33af1ac275888611c
diff --git a/core/proguard.flags b/core/proguard.flags
index 3544b90..06e32cc 100644
--- a/core/proguard.flags
+++ b/core/proguard.flags
@@ -38,6 +38,12 @@
     java.lang.Class class$(java.lang.String, boolean);
 }
 
+# Keep classes and methods that have the guava @VisibleForTesting annotation
+-keep @com.google.common.annotations.VisibleForTesting class *
+-keepclassmembers class * {
+@com.google.common.annotations.VisibleForTesting *;
+}
+
 # Please specify classes to be kept explicitly in your package's configuration.
 # -keep class * extends android.app.Activity
 # -keep class * extends android.view.View