Rolling R8 1.6.28 -> 1.7.13

I manually tested that 1013972 was fixed.

Bug: 1013972
Change-Id: If93c5a8e0486599060efb0b8d6b116f7082c4e79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864565
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707239}

DEPS

@@ -1372,7 +1372,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/r8',
-              'version': 'VYsSPB6QlnJQH-2vJBhK8T6r0mexvbb9klMKwnK22GoC',
+              'version': 'IOR6mtzOa3X07B0hIZ5U2prEf0GbTvCdN8no1FjNAtQC',
           },
       ],
       'condition': 'checkout_android',

third_party/r8/README.chromium

 Name: R8
 URL: https://r8.googlesource.com/r8
-Revision: d11d42306845f15f383c1867f0f26c6f36e3adc4
-Version: 1.6.28-dev
+Revision: f016f7d670c7afe027d48b4c053a455bb81c0733
+Version: 1.7.13-dev
 License: BSD 3-Clause
 License File: NOT_SHIPPED
 Security Critical: no

third_party/r8/local_modifications.diff

 diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
-index c9407a85f..800d6e760 100644
+index 89aeb2da4..8ff4f835e 100644
 --- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
 +++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
-@@ -186,8 +186,8 @@ public class InternalOptions {
-   // Optimization-related flags. These should conform to -dontoptimize and disableAllOptimizations.
+@@ -189,8 +189,8 @@ public class InternalOptions {
    public boolean enableDynamicTypeOptimization = true;
-   public boolean enableFieldBitAccessAnalysis = false;
+   public boolean enableFieldBitAccessAnalysis =
+       System.getProperty("com.android.tools.r8.fieldBitAccessAnalysis") != null;
 -  public boolean enableHorizontalClassMerging = true;
 -  public boolean enableVerticalClassMerging = true;
 +  public boolean enableHorizontalClassMerging = false;
@@ -13,7 +13,7 @@ index c9407a85f..800d6e760 100644
    public boolean enableArgumentRemoval = true;
    public boolean enableUnusedArgumentRemoval = true;
    public boolean enableUnusedInterfaceRemoval = true;
-@@ -902,7 +902,7 @@ public class InternalOptions {
+@@ -910,7 +910,7 @@ public class InternalOptions {
      public static final String CLASS_NAME = "com.android.tools.r8.GeneratedOutlineSupport";
      public static final String METHOD_PREFIX = "outline";