SetupWizard: Update proguard for play services 8115000

Change-Id: Ia3dfa3190b08fac70de2fe088da419d96b0ffa9e

proguard.flags

@@ -1,3 +1,25 @@
 -keep class * extends java.util.ListResourceBundle {
     protected Object[][] getContents();
-}
+}
+
+# Keep SafeParcelable value, needed for reflection. This is required to support backwards
+# compatibility of some classes.
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+    public static final *** NULL;
+}
+
+# Keep the names of classes/members we need for client functionality.
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+    @com.google.android.gms.common.annotation.KeepName *;
+}
+
+# Needed for Parcelable/SafeParcelable Creators to not get stripped
+-keepnames class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}
+
+# Needed when building against the Marshmallow SDK
+-dontwarn org.apache.http.**
+-dontwarn android.support.**
+-dontwarn com.google.android.gms.**

res/values/version.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <integer name="google_play_services_version">4323000</integer>
-</resources>