[Android Software Development] Deltadroid:
Play Services and LMY48I

Google Play Services has been updated to version 7.8.99-2134222-x3x-7899x3x (Multi DPI) for lollipop and kitkat base gapps. In addition, the core applications in the base gapps package for lollipop 5.1.1 have been updated using the latest nexus factory image (LMY48I). The new version of SetupWizard for phones in the 5.1.1 base gapps package has been patched to fix NOP deodex bug found in current java toolsets (see below for smali patch).

Kitkat Base Gapps package for 4.4.4: gapps-444-base-20150807-1-signed.zip

Lollipop Base Gapps package for 5.0.2: gapps-502-base-20150807-1-signed.zip

Lollipop Base Gapps package for 5.1.1: gapps-511-base-20150807-1-signed.zip

Binary files gapps-444-base-20150729-1-signed/optional/gms/0/priv-app/PrebuiltGmsCore.apk and gapps-444-base-20150807-1-signed/optional/gms/0/priv-app/PrebuiltGmsCore.apk differ
Binary files gapps-444-base-20150729-1-signed/optional/gms/2/priv-app/PrebuiltGmsCore.apk and gapps-444-base-20150807-1-signed/optional/gms/2/priv-app/PrebuiltGmsCore.apk differ
Binary files gapps-444-base-20150729-1-signed/optional/gms/4/priv-app/PrebuiltGmsCore.apk and gapps-444-base-20150807-1-signed/optional/gms/4/priv-app/PrebuiltGmsCore.apk differ
Binary files gapps-444-base-20150729-1-signed/optional/gms/6/priv-app/PrebuiltGmsCore.apk and gapps-444-base-20150807-1-signed/optional/gms/6/priv-app/PrebuiltGmsCore.apk differ
Binary files gapps-444-base-20150729-1-signed/optional/gms/8/priv-app/PrebuiltGmsCore.apk and gapps-444-base-20150807-1-signed/optional/gms/8/priv-app/PrebuiltGmsCore.apk differ
diff -ru '--exclude=CERT.RSA' '--exclude=CERT.SF' '--exclude=MANIFEST.MF' gapps-444-base-20150729-1-signed/system/etc/g.prop gapps-444-base-20150807-1-signed/system/etc/g.prop
--- gapps-444-base-20150729-1-signed/system/etc/g.prop	2008-02-29 02:33:46.000000000 +0100
+++ gapps-444-base-20150807-1-signed/system/etc/g.prop	2008-02-29 02:33:46.000000000 +0100
@@ -1,6 +1,6 @@
# begin addon properties
ro.addon.type=gapps
ro.addon.platform=kk
-ro.addon.version=gapps-444-base-20150729-1
+ro.addon.version=gapps-444-base-20150807-1
ro.addon.minimumversion=4.4.4
# end addon properties
Binary files gapps-444-base-20150729-1-signed/system/lib/libAppDataSearch.so and gapps-444-base-20150807-1-signed/system/lib/libAppDataSearch.so differ
Binary files gapps-444-base-20150729-1-signed/system/lib/libgmscore.so and gapps-444-base-20150807-1-signed/system/lib/libgmscore.so differ
Binary files gapps-444-base-20150729-1-signed/system/lib/libWhisper.so and gapps-444-base-20150807-1-signed/system/lib/libWhisper.so differ

Binary files gapps-502-base-20150729-1-signed/optional/gms/0/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-502-base-20150807-1-signed/optional/gms/0/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-502-base-20150729-1-signed/optional/gms/4/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-502-base-20150807-1-signed/optional/gms/4/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-502-base-20150729-1-signed/optional/gms/6/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-502-base-20150807-1-signed/optional/gms/6/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-502-base-20150729-1-signed/optional/gms/8/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-502-base-20150807-1-signed/optional/gms/8/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
diff -ru '--exclude=CERT.RSA' '--exclude=CERT.SF' '--exclude=MANIFEST.MF' gapps-502-base-20150729-1-signed/system/etc/g.prop gapps-502-base-20150807-1-signed/system/etc/g.prop
--- gapps-502-base-20150729-1-signed/system/etc/g.prop	2008-02-29 02:33:46.000000000 +0100
+++ gapps-502-base-20150807-1-signed/system/etc/g.prop	2008-02-29 02:33:46.000000000 +0100
@@ -1,6 +1,6 @@
# begin addon properties
ro.addon.type=gapps
ro.addon.platform=lp
-ro.addon.version=gapps-502-base-20150729-1
+ro.addon.version=gapps-502-base-20150807-1
ro.addon.minimumversion=5.0.2
# end addon properties
Binary files gapps-502-base-20150729-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so and gapps-502-base-20150807-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so differ
Binary files gapps-502-base-20150729-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so and gapps-502-base-20150807-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so differ
Binary files gapps-502-base-20150729-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so and gapps-502-base-20150807-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so differ

Binary files gapps-511-base-20150729-1-signed/optional/face/app/FaceLock/FaceLock.apk and gapps-511-base-20150807-1-signed/optional/face/app/FaceLock/FaceLock.apk differ
Binary files gapps-511-base-20150729-1-signed/optional/face/lib/libfacelock_jni.so and gapps-511-base-20150807-1-signed/optional/face/lib/libfacelock_jni.so differ
Binary files gapps-511-base-20150729-1-signed/optional/gms/0/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-511-base-20150807-1-signed/optional/gms/0/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-511-base-20150729-1-signed/optional/gms/4/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-511-base-20150807-1-signed/optional/gms/4/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-511-base-20150729-1-signed/optional/gms/6/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-511-base-20150807-1-signed/optional/gms/6/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-511-base-20150729-1-signed/optional/gms/8/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-511-base-20150807-1-signed/optional/gms/8/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-511-base-20150729-1-signed/optional/setup/phone/priv-app/SetupWizard/SetupWizard.apk and gapps-511-base-20150807-1-signed/optional/setup/phone/priv-app/SetupWizard/SetupWizard.apk differ
Binary files gapps-511-base-20150729-1-signed/optional/setup/tablet/priv-app/SetupWizard/SetupWizard.apk and gapps-511-base-20150807-1-signed/optional/setup/tablet/priv-app/SetupWizard/SetupWizard.apk differ
Binary files gapps-511-base-20150729-1-signed/system/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk and gapps-511-base-20150807-1-signed/system/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk differ
diff -ru '--exclude=CERT.RSA' '--exclude=CERT.SF' '--exclude=MANIFEST.MF' gapps-511-base-20150729-1-signed/system/etc/g.prop gapps-511-base-20150807-1-signed/system/etc/g.prop
--- gapps-511-base-20150729-1-signed/system/etc/g.prop	2008-02-29 02:33:46.000000000 +0100
+++ gapps-511-base-20150807-1-signed/system/etc/g.prop	2008-02-29 02:33:46.000000000 +0100
@@ -1,6 +1,6 @@
# begin addon properties
ro.addon.type=gapps
ro.addon.platform=lp
-ro.addon.version=gapps-511-base-20150729-1
+ro.addon.version=gapps-511-base-20150807-1
ro.addon.minimumversion=5.1.1
# end addon properties
Binary files gapps-511-base-20150729-1-signed/system/framework/com.google.android.camera2.jar and gapps-511-base-20150807-1-signed/system/framework/com.google.android.camera2.jar differ
Binary files gapps-511-base-20150729-1-signed/system/framework/com.google.android.dialer.support.jar and gapps-511-base-20150807-1-signed/system/framework/com.google.android.dialer.support.jar differ
Binary files gapps-511-base-20150729-1-signed/system/framework/com.google.android.maps.jar and gapps-511-base-20150807-1-signed/system/framework/com.google.android.maps.jar differ
Binary files gapps-511-base-20150729-1-signed/system/framework/com.google.android.media.effects.jar and gapps-511-base-20150807-1-signed/system/framework/com.google.android.media.effects.jar differ
Binary files gapps-511-base-20150729-1-signed/system/framework/com.google.widevine.software.drm.jar and gapps-511-base-20150807-1-signed/system/framework/com.google.widevine.software.drm.jar differ
Binary files gapps-511-base-20150729-1-signed/system/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk and gapps-511-base-20150807-1-signed/system/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk differ
Binary files gapps-511-base-20150729-1-signed/system/priv-app/GoogleFeedback/GoogleFeedback.apk and gapps-511-base-20150807-1-signed/system/priv-app/GoogleFeedback/GoogleFeedback.apk differ
Binary files gapps-511-base-20150729-1-signed/system/priv-app/GoogleLoginService/GoogleLoginService.apk and gapps-511-base-20150807-1-signed/system/priv-app/GoogleLoginService/GoogleLoginService.apk differ
Binary files gapps-511-base-20150729-1-signed/system/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk and gapps-511-base-20150807-1-signed/system/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk differ
Binary files gapps-511-base-20150729-1-signed/system/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk and gapps-511-base-20150807-1-signed/system/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk differ
Binary files gapps-511-base-20150729-1-signed/system/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk and gapps-511-base-20150807-1-signed/system/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk differ
Binary files gapps-511-base-20150729-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so and gapps-511-base-20150807-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so differ
Binary files gapps-511-base-20150729-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so and gapps-511-base-20150807-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so differ
Binary files gapps-511-base-20150729-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so and gapps-511-base-20150807-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so differ

diff -ru SetupWizard-out/android/support/v4/media/MediaMetadataCompat.smali SetupWizard_phone-out/android/support/v4/media/MediaMetadataCompat.smali
--- SetupWizard-out/android/support/v4/media/MediaMetadataCompat.smali	2015-08-06 01:00:47.516938400 +0200
+++ SetupWizard_phone-out/android/support/v4/media/MediaMetadataCompat.smali	2015-08-06 01:00:56.892938393 +0200
@@ -70,7 +70,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 205
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -81,7 +81,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 206
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -92,7 +92,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 207
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -103,7 +103,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 208
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -114,7 +114,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 209
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -125,7 +125,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 210
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -136,7 +136,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 211
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -147,7 +147,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 212
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -158,7 +158,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 213
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -169,7 +169,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 214
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -180,7 +180,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 215
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -191,7 +191,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 216
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -202,7 +202,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 217
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -213,7 +213,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 218
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -224,7 +224,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 219
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -235,7 +235,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 220
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -246,7 +246,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 221
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -257,7 +257,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 222
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -268,7 +268,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 223
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -279,7 +279,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 224
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -290,7 +290,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 225
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -301,7 +301,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 226
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -312,7 +312,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 227
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -323,7 +323,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 228
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -334,7 +334,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 229
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -345,7 +345,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 230
sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->METADATA_KEYS_TYPE:Landroid/support/v4/util/ArrayMap;
@@ -356,7 +356,7 @@

move-result-object v2

- invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v0, v1, v2}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

.line 233
const/4 v0, 0x7
diff -ru SetupWizard-out/com/google/android/gms/internal/bu.smali SetupWizard_phone-out/com/google/android/gms/internal/bu.smali
--- SetupWizard-out/com/google/android/gms/internal/bu.smali	2015-08-06 01:00:49.612938398 +0200
+++ SetupWizard_phone-out/com/google/android/gms/internal/bu.smali	2015-08-06 01:00:59.192938391 +0200
@@ -234,9 +234,7 @@

move-object v0, v1

- nop
-
- nop
+ check-cast v0, Ljava/lang/String;

invoke-static {v2, v0}, Lcom/google/android/gms/internal/bu;->b(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/internal/jp;

@@ -272,9 +270,7 @@

move-object v0, v1

- nop
-
- nop
+ check-cast v0, Ljava/lang/String;

invoke-static {v2, v0}, Lcom/google/android/gms/internal/bu;->b(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/internal/jp;

@@ -346,9 +342,7 @@

move-object v0, v1

- nop
-
- nop
+ check-cast v0, Ljava/lang/String;

invoke-static {v2, v0}, Lcom/google/android/gms/internal/bu;->b(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/internal/jp;

@@ -366,9 +360,7 @@

const-string v0, "gads:request_builder:singleton_webview_experiment_id"

- nop
-
- nop
+ check-cast v1, Ljava/lang/String;

invoke-static {v0, v1}, Lcom/google/android/gms/internal/bu;->b(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/internal/jp;

diff -ru SetupWizard-out/com/google/android/setupwizard/util/CountryHelper.smali SetupWizard_phone-out/com/google/android/setupwizard/util/CountryHelper.smali
--- SetupWizard-out/com/google/android/setupwizard/util/CountryHelper.smali	2015-08-06 01:00:50.696938397 +0200
+++ SetupWizard_phone-out/com/google/android/setupwizard/util/CountryHelper.smali	2015-08-06 01:00:59.928938390 +0200
@@ -33,9 +33,7 @@

const/4 v0, 0x0

- nop
-
- nop
+ check-cast v0, Ljava/lang/String;

invoke-static {v1, v0}, Lcom/google/android/setupwizard/util/GservicesValue;->value(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/setupwizard/util/GservicesValue;